From: Boris Ostrovsky Date: Tue, 25 Nov 2014 16:11:50 +0000 (-0500) Subject: pygrub: Fix regression from c/s d1b93ea, attempt 2 X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~4030 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=3b279811707dab4bab95c2e952e94ebf4d6badd9;p=xen.git pygrub: Fix regression from c/s d1b93ea, attempt 2 c/s d1b93ea causes substantial functional regressions in pygrub's ability to parse bootloader configuration files. c/s d1b93ea itself changed an an interface which previously used exclusively integers, to using strings in the case of a grub configuration with explicit default set, along with changing the code calling the interface to require a string. The default value for "default" remained as an integer. As a result, any Extlinux or Lilo configuration (which drives this interface exclusively with integers), or Grub configuration which doesn't explicitly declare a default will die with an AttributeError when attempting to call "self.cf.default.isdigit()" where "default" is an integer. Sadly, this AttributeError gets swallowed by the blanket ignore in the loop which searches partitions for valid bootloader configurations, causing the issue to be reported as "Unable to find partition containing kernel" We should explicitly check type of "default" in image_index() and process it appropriately. Reported-by: Andrew Cooper Signed-off-by: Boris Ostrovsky Acked-by: Ian Campbell --- diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub old mode 100644 new mode 100755 index aa7e562e8a..3ec52fd486 --- a/tools/pygrub/src/pygrub +++ b/tools/pygrub/src/pygrub @@ -457,7 +457,9 @@ class Grub: self.cf.parse(buf) def image_index(self): - if self.cf.default.isdigit(): + if isinstance(self.cf.default, int): + sel = self.cf.default + elif self.cf.default.isdigit(): sel = int(self.cf.default) else: # We don't fully support submenus. Look for the leaf value in